tests: Move test-varint and test-rollsum under "make check"

"make check" tests are always enabled and they do not require to be
installed.

Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>

diff --git a/Makefile-tests.am b/Makefile-tests.am
index d4b8e2acd3cca1744900bb94f926c68519c73b88..1ac5c5a248fe8f15011d35a2fa0bcb3b627c172d 100644 (file)
--- a/Makefile-tests.am
+++ b/Makefile-tests.am
@@ -19,7 +19,6 @@
 
 
 if BUILDOPT_INSTALL_TESTS
-insttest_PROGRAMS = 
 
 insttestdir=$(pkglibexecdir)/installed-tests
 testfiles = test-basic \
@@ -94,23 +93,6 @@ INSTALL_DATA_HOOKS += install-gpg-data-hook
         echo 'Type=session' >> $@.tmp; \
         mv $@.tmp $@)
 
-%.test: tests/%.c Makefile
-       $(AM_V_GEN) (echo '[Test]' > $@.tmp; \
-        echo 'Exec=$(pkglibexecdir)/installed-tests/$(notdir $(<:.c=))' >> $@.tmp; \
-        echo 'Type=session' >> $@.tmp; \
-        mv $@.tmp $@)
-
-insttest_PROGRAMS += test-varint
-test_varint_SOURCES = src/libostree/ostree-varint.c tests/test-varint.c
-test_varint_CFLAGS = $(ostree_bin_shared_cflags) $(OT_INTERNAL_GIO_UNIX_CFLAGS)
-test_varint_LDADD = $(ostree_bin_shared_ldadd) $(OT_INTERNAL_GIO_UNIX_LIBS)
-testmeta_DATA += test-varint.test
-
-insttest_PROGRAMS += test-rollsum
-test_rollsum_SOURCES = src/libostree/bupsplit.c tests/test-rollsum.c
-test_rollsum_CFLAGS = $(ostree_bin_shared_cflags) $(OT_INTERNAL_GIO_UNIX_CFLAGS)
-test_rollsum_LDADD = $(ostree_bin_shared_ldadd) $(OT_INTERNAL_GIO_UNIX_LIBS)
-
 if BUILDOPT_GJS
 insttest_SCRIPTS += tests/test-core.js \
        tests/test-sizes.js \
@@ -120,3 +102,16 @@ testmeta_DATA += test-core.test test-sizes.test test-sysroot.test
 endif
 
 endif
+
+# "make check" do not depend from --enable-installed-tests
+check_PROGRAMS = tests/test-rollsum tests/test-varint
+
+tests_test_rollsum_SOURCES = src/libostree/bupsplit.c tests/test-rollsum.c
+tests_test_rollsum_CFLAGS = $(ostree_bin_shared_cflags) $(OT_INTERNAL_GIO_UNIX_CFLAGS)
+tests_test_rollsum_LDADD = $(ostree_bin_shared_ldadd) $(OT_INTERNAL_GIO_UNIX_LIBS)
+
+tests_test_varint_SOURCES = src/libostree/ostree-varint.c tests/test-varint.c
+tests_test_varint_CFLAGS = $(ostree_bin_shared_cflags) $(OT_INTERNAL_GIO_UNIX_CFLAGS)
+tests_test_varint_LDADD = $(ostree_bin_shared_ldadd) $(OT_INTERNAL_GIO_UNIX_LIBS)
+
+TESTS = tests/test-rollsum tests/test-varint

diff --git a/Makefile.am b/Makefile.am
index 34381ec30935cae9e441cd4712d33fc63eb2327a..e02177d107ff28012fd5a8dafd45cdcd08f2ec56 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -84,7 +84,8 @@ release-tarball-embedded:
 check-local:
        @echo "  *** NOTE ***"
        @echo "  *** NOTE ***"
-       @echo "    ostree only supports https://live.gnome.org/GnomeGoals/InstalledTests"
-       @echo "    To run them, ostree must be configured with --enable-installed-tests and installed"
+       @echo " \"make check\" only runs a subset of OSTree's tests."
+       @echo " The other tests use: use https://live.gnome.org/GnomeGoals/InstalledTests"
+       @echo " To run them, ostree must be configured with --enable-installed-tests and installed"
        @echo "  *** NOTE ***"
        @echo "  *** NOTE ***"

diff --git a/configure.ac b/configure.ac
index 335065727a65c1e92a2f872432515cd40c1d0628..4fe6d56a3b8ad6abdfcb7ff96302287aded7f3e1 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@ AC_CONFIG_HEADER([config.h])
 AC_CONFIG_MACRO_DIR([m4])
 AC_CONFIG_AUX_DIR([build-aux])
 
-AM_INIT_AUTOMAKE([1.11 -Wno-portability foreign no-define tar-ustar no-dist-gzip dist-xz])
+AM_INIT_AUTOMAKE([1.13 -Wno-portability foreign no-define tar-ustar no-dist-gzip dist-xz color-tests parallel-tests])
 AM_MAINTAINER_MODE([enable])
 AM_SILENT_RULES([yes])
 AC_USE_SYSTEM_EXTENSIONS